From 9fb9d208fdc37b50ee0bac962153909ffda68f67 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 22 Feb 2016 11:16:32 +0100 Subject: [PATCH] Adwaita: fix scale with marks sliders looks like sass was confused by the way I structured the loops, this works that around. --- gtk/theme/Adwaita/_common.scss | 70 ++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 132 +++++++++-------------- gtk/theme/Adwaita/gtk-contained.css | 132 +++++++++-------------- 3 files changed, 130 insertions(+), 204 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index f280ca1ea3..fab44eb576 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2580,47 +2580,45 @@ scale { // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those... $suffix: if($variant == 'light', '', '-dark'); - @each $dir_class, $dir_infix in ('', 'horz'), - ('.vertical', 'vert') { + @each $dir_class, $dir_infix in ('horizontal', 'horz'), + ('vertical', 'vert') { @each $marks_infix, $nth_child in ('scale-has-marks-above', ':last-child:not(:only-child)'), ('scale-has-marks-below', ':first-child:not(:only-child)') { - &#{$dir_class} { - @each $state, $state_infix in ('', ''), - (':hover', '-hover'), - (':active', '-active'), - (':disabled', '-insensitive'), - (':backdrop', '-backdrop'), - (':backdrop:disabled', '-backdrop-insensitive') { - - @at-root %#{$marks_infix}-#{$dir_infix}, - trough#{$nth_child} { - slider { - margin: 0 1px; - &#{$state} { - $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}'; - // @warn $_file_name; // uncomment for debuggin purpose... - border-style: none; - border-radius: 0; - - background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png')); - - $_scale_slider_bg_pos: bottom; - @if $dir_infix == 'horz' { - @if $marks_infix == 'scale-has-marks-above' { - $_scale_slider_bg_pos: top; - margin-top: 1px; - } + @each $state, $state_infix in ('', ''), + (':hover', '-hover'), + (':active', '-active'), + (':disabled', '-insensitive'), + (':backdrop', '-backdrop'), + (':backdrop:disabled', '-backdrop-insensitive') { + + @at-root %#{$marks_infix}-#{$dir_infix}, + &.#{$dir_class} trough#{$nth_child} { + slider { + margin: 0 1px; + &#{$state} { + $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}'; + @warn $_scale_asset; // uncomment for debuggin purpose... + border-style: none; + border-radius: 0; + + background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png')); + + $_scale_slider_bg_pos: bottom; + @if $dir_infix == 'horz' { + @if $marks_infix == 'scale-has-marks-above' { + $_scale_slider_bg_pos: top; + margin-top: 1px; } - @else { - @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left bottom; } - @else { $_scale_slider_bg_pos: right bottom; } - } - - background-position: $_scale_slider_bg_pos; - background-repeat: no-repeat; - box-shadow: none; } + @else { + @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left bottom; } + @else { $_scale_slider_bg_pos: right bottom; } + } + + background-position: $_scale_slider_bg_pos; + background-repeat: no-repeat; + box-shadow: none; } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 463cdc11bf..af098e782c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2763,11 +2763,9 @@ scale { -gtk-icon-shadow: none; } scale marks { color: alpha(currentColor,0.4); } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); @@ -2775,11 +2773,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:hover, - trough:last-child:not(:only-child) slider:hover { + scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); @@ -2787,11 +2783,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:active, - trough:last-child:not(:only-child) slider:active { + scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); @@ -2799,11 +2793,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:disabled, - trough:last-child:not(:only-child) slider:disabled { + scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); @@ -2811,11 +2803,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:backdrop, - trough:last-child:not(:only-child) slider:backdrop { + scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); @@ -2823,11 +2813,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:backdrop:disabled, - trough:last-child:not(:only-child) slider:backdrop:disabled { + scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); @@ -2835,186 +2823,162 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:hover { + scale.horizontal trough:first-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:active { + scale.horizontal trough:first-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:disabled { + scale.horizontal trough:first-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:backdrop { + scale.horizontal trough:first-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:backdrop:disabled { + scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:hover, - trough:last-child:not(:only-child) slider:hover { + scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:active, - trough:last-child:not(:only-child) slider:active { + scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:disabled, - trough:last-child:not(:only-child) slider:disabled { + scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop, - trough:last-child:not(:only-child) slider:backdrop { + scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, - trough:last-child:not(:only-child) slider:backdrop:disabled { + scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:hover, - trough:first-child:not(:only-child) slider:hover { + scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:active, - trough:first-child:not(:only-child) slider:active { + scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:disabled, - trough:first-child:not(:only-child) slider:disabled { + scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop, - trough:first-child:not(:only-child) slider:backdrop { + scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, - trough:first-child:not(:only-child) slider:backdrop:disabled { + scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 969c5d79e2..a84db8a814 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2794,11 +2794,9 @@ scale { -gtk-icon-shadow: none; } scale marks { color: alpha(currentColor,0.4); } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); @@ -2806,11 +2804,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:hover, - trough:last-child:not(:only-child) slider:hover { + scale.color.horizontal trough slider:hover, scale.horizontal trough:last-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); @@ -2818,11 +2814,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:active, - trough:last-child:not(:only-child) slider:active { + scale.color.horizontal trough slider:active, scale.horizontal trough:last-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); @@ -2830,11 +2824,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:disabled, - trough:last-child:not(:only-child) slider:disabled { + scale.color.horizontal trough slider:disabled, scale.horizontal trough:last-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); @@ -2842,11 +2834,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:backdrop, - trough:last-child:not(:only-child) slider:backdrop { + scale.color.horizontal trough slider:backdrop, scale.horizontal trough:last-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); @@ -2854,11 +2844,9 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - scale.color.horizontal trough slider, - trough:last-child:not(:only-child) slider { + scale.color.horizontal trough slider, scale.horizontal trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.horizontal trough slider:backdrop:disabled, - trough:last-child:not(:only-child) slider:backdrop:disabled { + scale.color.horizontal trough slider:backdrop:disabled, scale.horizontal trough:last-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); @@ -2866,186 +2854,162 @@ scale { background-position: top; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:hover { + scale.horizontal trough:first-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:active { + scale.horizontal trough:first-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:disabled { + scale.horizontal trough:first-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:backdrop { + scale.horizontal trough:first-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - trough:first-child:not(:only-child) slider { + scale.horizontal trough:first-child:not(:only-child) slider { margin: 0 1px; } - trough:first-child:not(:only-child) slider:backdrop:disabled { + scale.horizontal trough:first-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); background-position: bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:hover, - trough:last-child:not(:only-child) slider:hover { + scale.color.vertical:dir(rtl) trough slider:hover, scale.vertical trough:last-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:active, - trough:last-child:not(:only-child) slider:active { + scale.color.vertical:dir(rtl) trough slider:active, scale.vertical trough:last-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:disabled, - trough:last-child:not(:only-child) slider:disabled { + scale.color.vertical:dir(rtl) trough slider:disabled, scale.vertical trough:last-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop, - trough:last-child:not(:only-child) slider:backdrop { + scale.color.vertical:dir(rtl) trough slider:backdrop, scale.vertical trough:last-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(rtl) trough slider, - trough:last-child:not(:only-child) slider { + scale.color.vertical:dir(rtl) trough slider, scale.vertical trough:last-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, - trough:last-child:not(:only-child) slider:backdrop:disabled { + scale.color.vertical:dir(rtl) trough slider:backdrop:disabled, scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); background-position: left bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:hover, - trough:first-child:not(:only-child) slider:hover { + scale.color.vertical:dir(ltr) trough slider:hover, scale.vertical trough:first-child:not(:only-child) slider:hover { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:active, - trough:first-child:not(:only-child) slider:active { + scale.color.vertical:dir(ltr) trough slider:active, scale.vertical trough:first-child:not(:only-child) slider:active { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:disabled, - trough:first-child:not(:only-child) slider:disabled { + scale.color.vertical:dir(ltr) trough slider:disabled, scale.vertical trough:first-child:not(:only-child) slider:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop, - trough:first-child:not(:only-child) slider:backdrop { + scale.color.vertical:dir(ltr) trough slider:backdrop, scale.vertical trough:first-child:not(:only-child) slider:backdrop { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); background-position: right bottom; background-repeat: no-repeat; box-shadow: none; } - scale.color.vertical:dir(ltr) trough slider, - trough:first-child:not(:only-child) slider { + scale.color.vertical:dir(ltr) trough slider, scale.vertical trough:first-child:not(:only-child) slider { margin: 0 1px; } - scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, - trough:first-child:not(:only-child) slider:backdrop:disabled { + scale.color.vertical:dir(ltr) trough slider:backdrop:disabled, scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled { border-style: none; border-radius: 0; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); -- 2.30.2